feat(autoconfigure): Support both FunctionCallback and ToolCallback in ToolCallingAutoConfiguration #2233

tzolov · 2025-02-13T12:12:30Z

Extends the ToolCallingAutoConfiguration to support both FunctionCallback and ToolCallback types.
The toolCallbackResolver bean now handles both callback types through ObjectProvider injection.
Added comprehensive tests to verify the resolution of multiple function and tool callbacks.

ThomasVitale · 2025-02-13T12:54:06Z

.../main/java/org/springframework/ai/autoconfigure/chat/model/ToolCallingAutoConfiguration.java

-			List<FunctionCallback> toolCallbacks) {
-		var staticToolCallbackResolver = new StaticToolCallbackResolver(toolCallbacks);
+			ObjectProvider<List<FunctionCallback>> functionCallbacksProvider,
+			ObjectProvider<List<ToolCallback>> toolCallbacksProvider) {


ObjectProvider<List<FunctionCallback>> will provide both FunctionCallback and ToolCallback.
I think we can keep just ObjectProvider<List<FunctionCallback>> here, and in the next release we can replace it with ObjectProvider<List<ToolCallback>>.

ObjectProvider<List> will provide both FunctionCallback and ToolCallback.

I'm afraid this is not true.

Run the ToolCallingAutoConfigurationTests and put a breakpoint at ToolCallingAutoConfiguration line 59. You will find that the size of the List<FunctionCallback> allFunctionAndToolCallbacks is 2, e.g. the total number of the FunctionCallbacks defined in the test.
Then the ObjectProvider<List<ToolCallback>> toolCallbacksProvider will provide the remaining 3 ToolCallback definitions

ThomasVitale · 2025-02-13T16:31:10Z

spring-ai-core/src/main/java/org/springframework/ai/tool/StaticToolCallbackProvider.java

+	}
+
+	public StaticToolCallbackProvider(List<? extends FunctionCallback> toolCallbacks) {
+		Assert.notNull(toolCallbacks, "ToolCallbacks must not be null");


Consider adding

Assert.noNullElements(toolCallbacks, "toolCallbacks cannot contain null elements");

ThomasVitale · 2025-02-13T16:32:32Z

LGTM

…n ToolCallingAutoConfiguration - Extends the ToolCallingAutoConfiguration to support both FunctionCallback and ToolCallback types. - The toolCallbackResolver bean now handles both callback types through ObjectProvider injection. - Added comprehensive tests to verify the resolution of multiple function and tool callbacks. Signed-off-by: Christian Tzolov <[email protected]>

- Update ToolCallbackProvider to return FunctionCallback[] - Migrate from List to ToolCallbackProvider in configurations - Update tests to use new provider pattern Signed-off-by: Christian Tzolov <[email protected]>

…ients Refactor AsyncMcpToolCallbackProvider and SyncMcpToolCallbackProvider to handle multiple MCP clients Add ToolCallbackProvider support to ChatClient API Deprecate direct tool callback list methods in favor of providers Fix typos in Closeable class names Update MCP documentation with new examples and usage patterns Signed-off-by: Christian Tzolov <[email protected]>

ThomasVitale · 2025-02-13T19:21:30Z

spring-ai-core/src/main/java/org/springframework/ai/chat/client/ChatClient.java


 		ChatClientRequestSpec tools(Object... toolObjects);

+		ChatClientRequestSpec tools(ToolCallbackProvider... toolCallbackProvider);


Suggested change

ChatClientRequestSpec tools(ToolCallbackProvider... toolCallbackProvider);

ChatClientRequestSpec tools(ToolCallbackProvider... toolCallbackProviders);

ThomasVitale · 2025-02-13T19:21:49Z

spring-ai-core/src/main/java/org/springframework/ai/chat/client/ChatClient.java


 		Builder defaultTools(Object... toolObjects);

+		Builder defaultTools(ToolCallbackProvider... toolCallbackProvider);


Suggested change

Builder defaultTools(ToolCallbackProvider... toolCallbackProvider);

Builder defaultTools(ToolCallbackProvider... toolCallbackProviders);

ThomasVitale · 2025-02-13T19:23:35Z

spring-ai-core/src/main/java/org/springframework/ai/tool/StaticToolCallbackProvider.java

+import org.springframework.ai.model.function.FunctionCallback;
+import org.springframework.util.Assert;
+
+/**


Consider JavaDoc here

ThomasVitale · 2025-02-13T19:24:39Z

spring-ai-docs/src/main/antora/modules/ROOT/pages/api/mcp/mcp-client-boot-starter-docs.adoc


-Additionally, the registered MCP Tools with all MCP clients are provided as a list of ToolCallback instances:
+Additionally, the registered MCP Tools with all MCP clients are provided as a list of ToolCallback 
+throurgh a ToolCallbackProvider instance:


Suggested change

throurgh a ToolCallbackProvider instance:

through a ToolCallbackProvider instance:

ThomasVitale · 2025-02-13T19:25:09Z

spring-ai-docs/src/main/antora/modules/ROOT/pages/api/mcp/mcp-server-boot-starter-docs.adoc

 ----
 @Bean
-public List<ToolCallback> myTools(...) {
+public ToolCallbackProvier myTools(...) {


Suggested change

public ToolCallbackProvier myTools(...) {

public ToolCallbackProvider myTools(...) {

ThomasVitale · 2025-02-13T19:25:29Z

spring-ai-docs/src/main/antora/modules/ROOT/pages/api/mcp/mcp-server-boot-starter-docs.adoc

+public ToolCallbackProvier myTools(...) {
    List<ToolCallback> tools = ...
-    return tools;
+    return ToolCallbackProvier.from(tools);


Suggested change

return ToolCallbackProvier.from(tools);

return ToolCallbackProvider.from(tools);

Signed-off-by: Christian Tzolov <[email protected]>

tzolov · 2025-02-13T19:35:09Z

Rebased, squashed and merged at 1fdda61

tzolov force-pushed the extend-tool-calling-auto-conf branch from cc9a5ec to c945741 Compare February 13, 2025 12:49

tzolov changed the title ~~feat: Support both FunctionCallback and ToolCallback in ToolCallingAutoConfiguration~~ feat(autoconfigure): Support both FunctionCallback and ToolCallback in ToolCallingAutoConfiguration Feb 13, 2025

tzolov added this to the 1.0.0-M6 milestone Feb 13, 2025

tzolov added the tool/function calling label Feb 13, 2025

tzolov marked this pull request as ready for review February 13, 2025 12:51

ThomasVitale reviewed Feb 13, 2025

View reviewed changes

tzolov added 3 commits February 13, 2025 20:06

refactor: introduce new StaticToolCallbackProvider implementation

0c1abec

- Update ToolCallbackProvider to return FunctionCallback[] - Migrate from List to ToolCallbackProvider in configurations - Update tests to use new provider pattern Signed-off-by: Christian Tzolov <[email protected]>

tzolov force-pushed the extend-tool-calling-auto-conf branch from d5412a7 to d18262e Compare February 13, 2025 19:06

ThomasVitale reviewed Feb 13, 2025

View reviewed changes

addres review comments

fdc8a21

Signed-off-by: Christian Tzolov <[email protected]>

ThomasVitale approved these changes Feb 13, 2025

View reviewed changes

tzolov closed this Feb 13, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

feat(autoconfigure): Support both FunctionCallback and ToolCallback in ToolCallingAutoConfiguration #2233

feat(autoconfigure): Support both FunctionCallback and ToolCallback in ToolCallingAutoConfiguration #2233

Uh oh!

tzolov commented Feb 13, 2025 •

edited

Loading

Uh oh!

ThomasVitale Feb 13, 2025

Uh oh!

tzolov Feb 13, 2025 •

edited

Loading

Uh oh!

ThomasVitale Feb 13, 2025

Uh oh!

ThomasVitale commented Feb 13, 2025

Uh oh!

ThomasVitale Feb 13, 2025

Uh oh!

ThomasVitale Feb 13, 2025

Uh oh!

ThomasVitale Feb 13, 2025

Uh oh!

ThomasVitale Feb 13, 2025

Uh oh!

ThomasVitale Feb 13, 2025

Uh oh!

ThomasVitale Feb 13, 2025

Uh oh!

tzolov commented Feb 13, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants


		ChatClientRequestSpec tools(Object... toolObjects);

		ChatClientRequestSpec tools(ToolCallbackProvider... toolCallbackProvider);


		Builder defaultTools(Object... toolObjects);

		Builder defaultTools(ToolCallbackProvider... toolCallbackProvider);

	throurgh a ToolCallbackProvider instance:
	through a ToolCallbackProvider instance:

	public ToolCallbackProvier myTools(...) {
	public ToolCallbackProvider myTools(...) {

	return ToolCallbackProvier.from(tools);
	return ToolCallbackProvider.from(tools);

feat(autoconfigure): Support both FunctionCallback and ToolCallback in ToolCallingAutoConfiguration #2233

feat(autoconfigure): Support both FunctionCallback and ToolCallback in ToolCallingAutoConfiguration #2233

Uh oh!

Conversation

tzolov commented Feb 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tzolov Feb 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ThomasVitale commented Feb 13, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tzolov commented Feb 13, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

tzolov commented Feb 13, 2025 •

edited

Loading

tzolov Feb 13, 2025 •

edited

Loading